bugfix(supply): Implement proportional supply bonus scaling to fix too generous money deposits for partial supply drops by tintinhamans · Pull Request #2431 · TheSuperHackers/GeneralsGameCode

tintinhamans · 2026-03-09T19:07:26Z

Resolves USA Chinook extra money drop is always 60$ no matter how big the base money load is #132
Added a new getMaxBoxes() method to SupplyTruckAIInterface and implemented it in both SupplyTruckAIUpdate and WorkerAIUpdate to expose the configured maximum box capacity.
Updated SupplyCenterDockUpdate::action to snapshot the box count before unloading and scale the upgrade bonus proportionally to the delivered cargo.

greptile-apps · 2026-03-09T19:11:49Z

Greptile Summary

This PR fixes an over-generous upgrade bonus in supply delivery by extracting the bonus calculation into a new getUpgradedSupplyBoostValue helper and scaling it proportionally to deliveredBoxes / maxBoxes, gated behind #if !RETAIL_COMPATIBLE_CRC to preserve CRC parity in retail-compatible builds.

Key changes:

Added getMaxBoxes() as a pure virtual to SupplyTruckAIInterface and implemented it in both SupplyTruckAIUpdate and WorkerAIUpdate (reading m_maxBoxesData from module data). ChinookAIUpdate inherits the implementation correctly from SupplyTruckAIUpdate.
Box count is now snapshotted via getNumberBoxes() before the loseOneBox() unload loop, which is the correct order for capturing the actual delivery quantity.
Division by zero when MaxBoxes is unconfigured (defaults to 0) is prevented by an explicit maxBoxes > 0 guard; the fallback returns 0 rather than the full boost for units without a configured MaxBoxes.
Integer truncation in (upgradedSupplyBoost * deliveredBoxes) / maxBoxes is a known trade-off discussed in the previous review thread — small boost values relative to maxBoxes can round down to 0 for partial loads.
Changes are correctly scoped to GeneralsMD/; the vanilla Generals/ codebase is unaffected.

Confidence Score: 4/5

Safe to merge with minor caveats — logic is sound and previously flagged issues are addressed.
The core implementation is correct: box count is snapshotted before unloading, division by zero is guarded, ChinookAIUpdate inherits the new method cleanly, and the retail-CRC gate is intentional. The remaining known trade-offs (integer truncation, maxBoxes == 0 returning 0 instead of full boost) were discussed in the prior review thread and appear to be deliberate decisions by the author. No new critical issues were identified.
No files require special attention; SupplyCenterDockUpdate.cpp carries the most logic complexity but is well-structured.

Important Files Changed

Filename	Overview
GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h	Adds `getMaxBoxes()` pure virtual to `SupplyTruckAIInterface` and a concrete implementation in `SupplyTruckAIUpdate` that reads `m_maxBoxesData`; `ChinookAIUpdate` inherits the implementation correctly via `SupplyTruckAIUpdateModuleData`. No issues.
GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h	Implements the new `getMaxBoxes()` virtual method by reading `m_maxBoxesData` from `WorkerAIUpdateModuleData`; consistent with the `SupplyTruckAIUpdate` counterpart. No issues.
GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyCenterDockUpdate.cpp	Extracts upgrade-boost calculation into `getUpgradedSupplyBoostValue`, guards against division-by-zero via `maxBoxes > 0`, and snapshots box count before unloading for correct proportional scaling; one minor concern around `deliveredBoxes > maxBoxes` edge case and existing integer-truncation issue (discussed in prior thread).

Sequence Diagram

sequenceDiagram
    participant Truck as SupplyTruck / Worker / Chinook
    participant Dock as SupplyCenterDockUpdate::action
    participant AI as SupplyTruckAIInterface

    Dock->>AI: getUpgradedSupplyBoostValue()
    activate AI
    Note over AI: #if RETAIL_COMPATIBLE_CRC → full boost (unscaled)
    AI->>AI: getMaxBoxes() → maxBoxes
    alt maxBoxes > 0
        AI->>AI: getUpgradedSupplyBoost() → boost
        AI->>AI: getNumberBoxes() → deliveredBoxes
        AI-->>Dock: (boost × deliveredBoxes) / maxBoxes
    else maxBoxes == 0
        AI-->>Dock: 0
    end
    deactivate AI

    loop while loseOneBox() returns true
        Dock->>AI: loseOneBox()
        Dock->>Dock: value += getSupplyBoxValue()
    end

    Dock->>Dock: value += scaledBoost
    Dock->>Dock: deposit(value) → player money

_{Last reviewed commit: 378bea0}

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyCenterDockUpdate.cpp

Mauller · 2026-03-10T13:23:03Z

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyCenterDockUpdate.cpp

+		Int maxBoxes = supplyTruckAI->getMaxBoxes();
+		if( maxBoxes > 0 )
+		{
+			value += upgradedSupplyBoost * deliveredBoxes / maxBoxes; // Intentional integer truncation.


Is the idea that the supply boost is only applied up to maxBoxes?

So if we have a limit of 5 boxes but we deliver 7? we should only be applying the boost to 5 boxes?

Since the above will be under valuing the bonus if so.

Nvm i misunderstood what it was doing.

But if max boxes is zero then should we be giving any kind of bonus since shouldn't it technically not be able to carry anything?

Good point - units with maxBoxes 0 have no business docking supplies anyways.

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyCenterDockUpdate.cpp

GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyCenterDockUpdate.cpp

xezon · 2026-03-10T22:40:12Z

Is this Zero Hour only?

tintinhamans · 2026-03-10T23:06:06Z

Is this Zero Hour only?

No Supply Lines upgrade in Generals, only in ZH.

xezon

Code is looking good.

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyCenterDockUpdate.cpp

xezon · 2026-03-14T12:11:04Z

This needs rebase.

Signed-off-by: tintinhamans <5984296+tintinhamans@users.noreply.github.com>

greptile-apps bot reviewed Mar 9, 2026

View reviewed changes

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyCenterDockUpdate.cpp Outdated Show resolved Hide resolved

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyCenterDockUpdate.cpp Outdated Show resolved Hide resolved

tintinhamans marked this pull request as draft March 9, 2026 19:15

tintinhamans force-pushed the arctic/propo-supply-bonus branch 3 times, most recently from 7bfc70d to 0f2e2bf Compare March 9, 2026 22:02

tintinhamans marked this pull request as ready for review March 9, 2026 22:02

greptile-apps bot reviewed Mar 9, 2026

View reviewed changes

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyCenterDockUpdate.cpp Outdated Show resolved Hide resolved

Mauller reviewed Mar 10, 2026

View reviewed changes

tintinhamans force-pushed the arctic/propo-supply-bonus branch from 0f2e2bf to b87de30 Compare March 10, 2026 13:55

greptile-apps bot reviewed Mar 10, 2026

View reviewed changes

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyCenterDockUpdate.cpp Outdated Show resolved Hide resolved

tintinhamans force-pushed the arctic/propo-supply-bonus branch 2 times, most recently from e3eadf6 to bab6097 Compare March 10, 2026 14:34

xezon reviewed Mar 10, 2026

View reviewed changes

xezon added Bug Something is not working right, typically is user facing Minor Severity: Minor < Major < Critical < Blocker ZH Relates to Zero Hour labels Mar 10, 2026

tintinhamans force-pushed the arctic/propo-supply-bonus branch 2 times, most recently from 824e79e to bb5a635 Compare March 12, 2026 00:33

xezon approved these changes Mar 12, 2026

View reviewed changes

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyCenterDockUpdate.cpp Outdated Show resolved Hide resolved

tintinhamans force-pushed the arctic/propo-supply-bonus branch from bb5a635 to 67212ba Compare March 13, 2026 15:13

xezon approved these changes Mar 13, 2026

View reviewed changes

bugfix(supply): Implement proportional supply bonus scaling

378bea0

Signed-off-by: tintinhamans <5984296+tintinhamans@users.noreply.github.com>

tintinhamans force-pushed the arctic/propo-supply-bonus branch from 67212ba to 378bea0 Compare March 14, 2026 12:59

xezon changed the title ~~bugfix(supply): Implement proportional supply bonus scaling~~ bugfix(supply): Implement proportional supply bonus scaling to fix too generous money deposits for partial supply drops Mar 14, 2026

xezon added Nerf Makes a thing less powerful NoRetail This fix or change is not applicable with Retail game compatibility labels Mar 14, 2026

xezon merged commit b4b1cd7 into TheSuperHackers:main Mar 14, 2026
15 checks passed

tintinhamans deleted the arctic/propo-supply-bonus branch March 14, 2026 19:46

Conversation

tintinhamans commented Mar 9, 2026 • edited by xezon Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

greptile-apps bot commented Mar 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Greptile Summary

Confidence Score: 4/5

Important Files Changed

Sequence Diagram

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Mauller Mar 10, 2026

Choose a reason for hiding this comment

Uh oh!

Mauller Mar 10, 2026

Choose a reason for hiding this comment

Uh oh!

tintinhamans Mar 10, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

xezon commented Mar 10, 2026

Uh oh!

tintinhamans commented Mar 10, 2026

Uh oh!

xezon left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

xezon commented Mar 14, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

tintinhamans commented Mar 9, 2026 •

edited by xezon

Loading

greptile-apps bot commented Mar 9, 2026 •

edited

Loading